merge c and d server 2019